Merge b4bdev 20260122 #3709
Merged
Merge b4bdev 20260122 #3709
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…yet. FATES code is still having problems like not getting the shr_log_mod and errMsg subroutine in it, and this is setup for the shr_mpi_mod stub, but the testing will need to use the full shr_mpi_mod code. It also looks like getting the CESM unit testing to work with MPI would be an effort as we don't even build pFUnit with MPI libraries (although we did on Cheyenne)
Conflicts: src/main/test/CMakeLists.txt
…te_gdd20_baseline().
Merge b4b-dev to master Some documentation updates: Update the ctsm5.4 What's New file with text around the Carbon isotopes Fixes to names and units of canopy turbulence variables. New CTSM Tool: compare_parmfiles to nicely compare CTSM NetCDF parameter files in a clear way New namelist option: hist_all_fields == TRUE flags to output ALL available history fields by default Test-mod updates: Add a test-mod so that transient ERI tests work
Merge master 20260107
b4b-dev: Change some _U and _R history fields to be on by default
Use the cime tag now that the PR was merged
Conflicts: .gitmodules cime
b4b: Update to cime version that fixes the check_input_data --download issue
…ds working, had to remove decompInitMod and subgridMod
…ng the env variable MPISERIAL to \/glade/u/apps/derecho/23.09/spack/opt/spack/mpi-serial/2.5.0/oneapi/2023.2.1/p3fw and it appears that you have to run the build twice for it to work, as such I'll revert this afterwards. But, I'm saving the commit so it could be done easily in the future
…es setting the env variable MPISERIAL to \/glade/u/apps/derecho/23.09/spack/opt/spack/mpi-serial/2.5.0/oneapi/2023.2.1/p3fw and it appears that you have to run the build twice for it to work, as such I'll revert this afterwards. But, I'm saving the commit so it could be done easily in the future" This reverts commit 0461ea5.
…line Initial fixes to generate_gdd20_baseline
Co-authored-by: Samuel Levis <slevis@ucar.edu>
Correction from review. Co-authored-by: Samuel Levis <slevis@ucar.edu>
…irst time it's built, you have to build it twice for it to work. I commented it out and added some notes around it
Decomp mod unittest
Update cime to version that changes answers for ERI tests slevis resolved conflicts: .gitmodules
samsrabin
approved these changes
Jan 23, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
That PR updated to cime6.1.145, while updating b4b-dev to master in this PR gets us to cime6.1.146.
Specific notes
Contributors other than yourself, if any:
@olyson @ekluzek @samsrabin
CTSM Issues Fixed (include github issue #):
None.
Are answers expected to change (and if so in what way)?
No.
Any User Interface Changes (namelist or namelist defaults changes)?
No.
Does this create a need to change or add documentation? Did you do so?
No, no.
Testing performed, so far:
./run_sys_tests -s aux_clm -c ctsm5.4.010 -g ctsm5.4.011./run_sys_tests -s aux_clm -c ctsm5.4.010 -g ctsm5.4.011 --skip-git-status